Skip to content

feat: app lock forgot logout navigation [WPB-23188]#4569

Open
Garzas wants to merge 5 commits intodevelopfrom
fix/forgot-applock-logout
Open

feat: app lock forgot logout navigation [WPB-23188]#4569
Garzas wants to merge 5 commits intodevelopfrom
fix/forgot-applock-logout

Conversation

@Garzas
Copy link
Contributor

@Garzas Garzas commented Feb 5, 2026 •
edited by github-actions bot
Loading

https://wearezeta.atlassian.net/browse/WPB-23188

PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³

  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

  • The “Forgot App Lock” flow needs to switch from “Remove device” to a logout flow that preserves history unless the user opts to wipe data.
  • After logout, the app should always return to the correct login flow without leaving Home on the back stack.

Causes (Optional)

  • The previous flow and copy were built around device removal.
  • Login navigation was triggered within AppLockActivity, leaving WireActivity (Home) behind.

Solutions

  • Reworked “Forgot App Lock” to use a logout-based flow (soft or hard based on the checkbox) and updated all related copy.
  • After logout, AppLockActivity now launches WireActivity with CLEAR_TASK/NEW_TASK and finishes itself, so the login flow is the only thing on the stack.

@Garzas Garzas self-assigned this Feb 5, 2026
saleniuk
saleniuk approved these changes Feb 5, 2026
View reviewed changes
app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt Outdated
onClick = onContinue,
text = stringResource(R.string.user_profile_logout),
onClick = onLogout,
state = if (enabled) WireButtonState.Default else WireButtonState.Disabled,
Copy link
Contributor

@saleniuk saleniuk Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could add also loading state to this button? Logging out can take some time so it would be better to show loading spinner on the disabled button while user is waiting 🤔
Just add loading = !enabled or even change the name of enabled parameter to loggingOut or something 😄

@pull-request-size pull-request-size bot added size/L and removed size/M labels Feb 6, 2026
@codecov
Copy link

codecov bot commented Feb 6, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 48.49%. Comparing base (6e9bafe) to head (5af38f9).
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #4569      +/-   ##
===========================================
+ Coverage    48.45%   48.49%   +0.03%     
===========================================
  Files          575      575              
  Lines        19833    19764      -69     
  Branches      3315     3301      -14     
===========================================
- Hits          9610     9584      -26     
+ Misses        9208     9168      -40     
+ Partials      1015     1012       -3
Files with missing lines Coverage Δ
.../ui/home/appLock/forgot/ForgotLockCodeViewState.kt 100.00% <100.00%> (+54.54%) ⬆️
...i/home/appLock/forgot/ForgotLockScreenViewModel.kt 95.12% <100.00%> (+33.35%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6e9bafe...5af38f9. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 6, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@MohamadJaara MohamadJaara changed the title fix: app lock forgot logout navigation [WPB-23188] feat: app lock forgot logout navigation [WPB-23188] Feb 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sbakhtiarov sbakhtiarov sbakhtiarov approved these changes

@saleniuk saleniuk saleniuk approved these changes

@MohamadJaara MohamadJaara Awaiting requested review from MohamadJaara

Assignees

@Garzas Garzas

Labels

size/L

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Garzas @sbakhtiarov @saleniuk